Lots of fixes, see below

- Continued to distinguish 'you' and firend name in editing'
-added more better prompts
- more bug fixes and small improv.s