Improved Editor and stuff