Fix zoom + misc cleanup