Additions to types

Added commit messages and cleaned up a little
Heroku shit
Removed bad commits