Improved various comments