small changes, map working