fixed bug for column comment and some refactorings