some minor tweaks still