V1.1

Lots of tweaks and updates