de-crufting and some new line editing leetness