removed non-generic Map
minor bugfixes