bug fixes v1.1 for productions