text edits, also fixes #17