cleanup + zoom & loading fix