add zoom on mouseclick, + cleanup