minor changes, some cleanup