improve build output; all tests passing again