Fix mistaken follow probability >0. Fill out more combinatoric options for test suite. Misc improvements.