code changes from bug fixes