Additional Improvements to routes/index.js

Also small bugfixes.