main.js cleanup
merge neil's stuff
merge neil's stuff
signature