More Stuff

Just committing some bugfixes/aesthetic changes dun hate