performance blocking mode improvement
spec fixes