Merge pull request #779 from HakuG/stable

Fixed a few more bugs and the ellipsis (maybe?)
styles changed for map
Merge remote-tracking branch 'upstream/stable' into stable
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map
trying to fix the map