minor tweaks kinda over