bug fixes on branch