fix and completting codes