Many modifications

Code more organized; added Plist Content;