[Bugsy]

I already did fix the bug but haven't had a chance to look over the rest of the code for any other potential bugs. I will try to get it up by tomorrow

Cleanup feature sounds like a good idea