Bugs fixed: Wait_for_input now can be inhibited, other fixes.