fixes #todos && clean up html/js
Merge pull request #22 from tony-o/patch-3

fixes #todos && clean up html/js