1. Added feature to label and origin function. 2. Some bug fixes