Fixed some timing problems (too fast!)

Still need some timing fixing but usable...