1.0.4.2

Added a bunch of things