clean up & got zoom working kind of