begin building comparison builder
fix up a couple merge conflicts