Few more updates to Leap stuff, bit cleaner, running added but not applied right