small fixes + cleanup

cleaned up unnecessary comments and fixed the counters for the html
elements a and t