Fixes to gutter error marks.
Bringing teapo sources back in again.