minor changes, fixes