timestretch tidied up