ad some fix and package