v1.1 - Fixed lots of bugs