Minor fixes
Updated collision response