Nested comments and some adjustments to text spacing
Fixed comments not caching properly