code review bug fixes
Production Version 1