* fix "waiting for" issue. Not finished yet.
* fix a spell error which leads to wrong behaviour