- fixes for error clearing, timeouts