more option fix and renamming