Physics improvements

This fixes a few bugs and makes tokens square.