adjustments to physics and ridding of some warnings