minor visual cleanups and simple un and pw