A couple of bugs. One Ethan found/fixed. One Becky found.