Removed toggle-debug-on-error
Added ace-window
Minor changes