fixed inf loop, removed countdown wait