WORKING CORRECTLY! fixed timer, timeout length, various things