various additions and cleaning up of html