make register-timeout configurable
fix comments
don't spend a useless field
add debug logging
test cleanup