minor cleanups and annoyances.