fixed comments layout and config