Update heartstation

Some cleanup work
Fixed a ton of windows
Merge pull request #578 from wild-billy/maptest

Update heartstation