Cleaned up some stuff. Added some boilerplates. Mostly throw-aways