fixes #todos && clean up html/js