Fixed #56 and fixed #57 with Prather, Gugliucci efforts, ready to send PDF snippet to Simpson, Lynn and Raddick for comments