added full comment functionality