Added minor tweaks and fixes and config.