Add some comment blocks, and alpha order for tags