Minor ideas and improvements.