Lots of various updates, need to push this to the server.