more timing, fix etc.