Rollback, nothing significant.
added sizeof
fixed merge error (hopefully)