Misc update

random little things updated, not much else left to do before prototype
is done