made it harder to fail; minor fixes