Various fixes; experimental anti fall damage (may need to be reverted)