more little edits and fixes