Improve power limiter, add safety checks