update normalize and minor changes