kill while loop
fix up horrific test bug