Lots of progress, cleanup