update
A lot of clean up
holysmokes

NO COMMENTS IN TEMPLATE HTML