Add enhancements after stress testing

Added enhancements based on user input, switched over database to new
one to be used during production