more coffeescript changes