Fixed a bunch of things
Version bumped up to v1.0.0