adding maps and more
fixing tests