add sleepy wakeful window and clean up command handling