updated to coffeescript and other additions