add comments. fixed collapse/expand menu