commiting a number of bug fixes