AvalonEdit and cleanings

- ADD: AvalonEdit
- CHG: cleanings and improvements