Some cleanup and tweaks

Once mows module is updated to fix the ws issue, change package.json to expect the fixed version and merge this in.