new features and many fixes