Lots of cleaning and a little new stuff