More improvemenst. Still WIP.
Merge remote-tracking branch 'origin/master'
Added anykey wait text to most of the definitions.