added routes for maps and cleanded up a little