Code Cleanup + Bugfix + Small ReadMe Update

Need to tackle routes/index.js next. It's a mess.