Finish work on people, tried to write spec helper tests but two are failing (sorry, will hopefully resolve tomorrow); fix a few other unrelated items