some edits and fixes

some edits and fixes