bug fixes ready for prod