added htmlhelpers and a few minor changes