Got a bit further correcting some coffee.script issues