added map files, bugfixes