some changes (reordering items)
Some improvements <c-h> <c-f>