some changes and fixes
some changes and fixes