more changes and fixes
minor fixes