cleaned stuff up, fixed failing tests