Better sample script; minor improvements to Leap

...module