Some of my custom stuff
Fixed some 1.0 stuff