Lots of other changes and stuff... (I need to take better notes)