Fixed GOAL alignment, sometimes pieces act funny (eg X: 100.9999929)
Merging with borderwork branch