EDIT, strings handling

Had to break string handling as some commands take one but not the other
and vice-versa
EDIT

This is becoming absurd %)
Have to repeat myself that I'm learning