* update according to the feedback * update lisence and fix some test issues * update license msg in cs file * clean up