Fixed some stuff

Reset is working, timeout is working