Added a ton of new stuff, fixed a few bugs