documentation, clean up main template, comments in form