Use octect instead of byte
Assorted fixes
whitespace