Minor tweaks, still not passing tests