Added a bunch of cool stuff and fixes