various minor changes