Fixed a bunch of stuff for the final release