Fix some fallout.
Rename some branches.
Add lobster configurations to compare charlie's projection to our default.