cleanup and commenting
fix bug with main comment form
fix bug with comment submit