Tried to track down some bugs. Did a tiny bit of work on The Builder.