Renames, refactors, editor adds & fixes, controller verbeteringen