Lots of cleanup. Upgraded all deps.
a few more tweaks
New config file.