added load map, some changes in structure. etc.