Nicer output for progress
Better defaults
Replaced check with asserts