Some scale improvements and higher quality maps
merge fix