Cleaned up some things.

More parameters can be set from config file.