various tweaks and adjustments