made timeouts enums.
tidyup (removed debugging extern)