minor improvements referenced from 剎那字引