of course fix bugs and broken tests