Remove unnecessary leading zero
Add data bytes for reference
Fix user message strings