Review fixes, fix for Ali's crash, still failing 1 test