Lots of cleanup and improvements for Michael and Wendy
(johann.klemmack@gmail.com).