minor changes
other minor changes