Changing comment split to don't interfer with classes
Bug fixes