Clean-Ups, Fixes and other Junk