Updates based on testing 16 Aug 13

Updated, and fixed one bug, based on Doug's testing on 16 Aug 13.  More
updates are planned based on these tests.