style and map fix