fixed some bugs, added structure for commenting