fixes. all but one tests passing