minor tweaks, some changes to configurations