Editor is now in main folder
Mainly tweaks and bug fixes