Fixed a load of bugs and sorted floating and saving out