Added duration property automatically unless otherwise specified, tidied up autogenerated crap in app.js