Added production tweeks
Merge pull request #25 from Screengoose/production-tweeks

Added production tweeks