upgrade of some features and removal of some bugs.