Fixed/Improved editing, added settings