Fix a boat-load of problems with the new time/pitch options, still a
few more bugs to work out...