More cleanup and fixing.