fix transaction handling
decrease timeouts in scheduler