Some clean up, and a backround.