Fixed filemap
Fixed bugs