More parameters to make more configurable
Bug fix.