zooming and locking
merge nick's changes