Simplified parameters a great deal.

This should also solve everything in Issue #40.