Significant bug reduction

Now it stops when it says it will and does not going to a death spiral
when it detects. More testing to come, I'm sure there are still some
bugs I haven't found yet