lots and lots and lots of changes, trying to get hem easier to configure, but at the same time allow a lot of customization