various tune-ups, improvements to configuration

Authored by martinkostolny on May 9 2018, 8:10 PM.