Finally finished this and corrected time calc