Fixed Arian's suggestions/corrections