fixes and start to create better zooming