fix & add new features
fix & update some features