add notice and some fix