Sjs/fixes

General fixes on the road to running the node app.