fixes. all auto tests pass