More changes and new js/coffeescript