- some fixes for comments
merged