Cleaned up most of the main class, enough for tonight, more edits tomorrow! :P