fixed timouts not incrementing, added comments