Added a bunch of stuff! :D