timing fixes hopefully.