Fixed all of kevins changes.