more tweaks poss fixed?