some new patches and changes