some minor tweaks and adjustments