Added / Cleaned some comments