Changes to Aug 18 / #21 #33 #29 #32 #39