remaining bugs after fixing some of the easier situations