minor changes and fixes
minor changes and fixes