fix font and map issues