various minor changes, cleanup