fixed bugs, add new features
fixed bugs