Improve error detection / decoder