Second commit

Normalize and minor changes