Bug fixes

sometimes not showing map