Tweaks and stuff

Signed-off-by: Nicholas Egan <nicholas@egansoft.com>