major rewrite, map improvements, and additional chart.