bug fixes part 2