One-sided char diffs and fix a few other bugs