merge zarino's changes; re-indent code; add #run button back in; change ace theme;