some edits and fixes