some misc changes

a few misc. changes.