Minor changes. Still not passing all tests