Fixed sbox on host
Comments and cleanup