minor fix/cleanup
changed check status, so we don`t get exception in finish
switch sleep/advance