Fixed problems with comment function.