minor fixes, see if it passes the tests