Edits, tweaks, ws