Minor changes to matches coffeescript file
Merged in Natalie's further integration changes