various fix + leapMotion improvements