Data unset amd comments fix.