Version 1.1

Lots of fixes and stuff