major cleanup + made editor usable again