misc. small changes

version submitted to committee