Merged
Various fixes, fixed compression damaging physics