minor tweaks on stuff