big cleanup and better defaults.