#464 - code rev/corrections/improvements