+ screwing around
+ finall got zooming to work, somehow
Merge branch 'local'