Cleans up some of the older patches Brenden made.
Merge branch 'tmp' into staging