Cleanup, add Note support to FingerPositionY & FingerPositionZ