Lighter header and bug fix with onstop().