Fixed lots of bugs, corrected naming conventions, realised they forgot to commit individual changes.