More manual cleanup and improvements.