Added ship energy, improved map, other minor tweaks and fixes.