fix comment section bugs