Optimizing, Comments support

Optimizing, Comments support