Comment list fixes and optimizations