add attach wait
add reboot & more state checks