Map loading optimizations

Plus stock icon, and some bug fixes.