fix FingerTraining() & add surround mapping in clj