small changes and new features begun