Goals implemeted. More good physics now.
merge fixes