overtake fixes approved by jogibear9988

deal with it (8)