[@dragonmancer] okay I've edited my CS to include the changes you've asked for.