Minor CHanges in files. Working except map 6/7