Various fixes and improvements.  Expand slot discussion.