Simplified hex map code
More clean up
Bugfix