More cleaning, and updated readme