Add various comments and table wrap
Add missing image