major edits, stable now