xoff

- comments model
- regexps everywhere
- minor cleanups