General comments and clean up.