Merge pull request #2 from ecl3ctic/master

Merge my initial work, hopefully not break anything
zooming and locking
merge nick's changes
zooming
zooming
cleanup