better timing, 'clear' works again, minor changes