Adding better nested comments, fixing some bugs.