Break collision out, fix angular velocity integration