Some cleanup and new stuff.