fix deadlock, other improvements to locks, deprecate draw() will be
replaced by update, add + and - key for zooming in and out