Adding production changes

Fixes #3 and #4