minor changes, cleanups