tidying up
setting up intitial zoom
fixed conflicts