Increased the max size of CWord to 32
Fixed some assertions