Slight editing and answered challenge questions