Fixes some minor bugs, adds editor