some fix and correction