tweaks and edits