Further production modifications
Merge production-ready changes
Fix error bugs; clean up initial DB structure