Refactoring propulsion stats

Simplify propulsion stats and fix all usage.