Changed headers and order of parts as dicussed. Took care of some small things