More canvas stuff and cleaning up coffeescript