removed unused stuff.
fixed errors on html fields