Added a bunch of stuff we forgot to add before. Sorry guys!