Add some comment features

Add some comment features