short / long pause added
long/short fix
Some renaming