some edits and tweaks