Misc fixes

Swimming animation is now in, and the smart placement of the obs points
works