Additions to usage.
Fixed the create and calculate all states (-C switch)