removing zoom helpers
hammering
more zoom handling and edges state fix