some fixes for word commands