last round of bug fixes part 1