Better physics, enhanced state manager