Push conversion of Html* classes

and many fixes