set up coffeescript and minor fixes
fixed lists
merge changes
merge changes