a load of cleaning and a few todos