timing stuff fixed even more