Production Commit

Minor changes and tweaks for production