lots of more edits - and fixing line ending