Fixed a lot of the smaller integer warnings.
Re-indent some files, as well as moving single lines that have multiple semicolons to seperate lines to be more readable.
Some minor work on the preferences window controller class.