More cleaning, and randomly found a bug