improved mad set
pulled config file apart
refactored testing a little