fixed 2 bugs with comments