Changed: Improved some comments/description