Some tweaks, and work on stuff

Hopefully this'll be fun!