new features and bug fix