After testing with the Leap

A few small changes made after testing with the Leap