Some bug fixes, and exploring different parameter combinations.