Misc Update

Useless updates that will probably be rewritten in the end but here they
are.