bug correction galore part 1