fix some things...
make test pass