Cleanup and fix a lot.