* Form normalization
* Minor fixes