Ooops

Sets some things back to the way they should be and added some comments
plus rearranged the codes so it makes more sense in my head.