documentation changes
refactor out common code
somewhat simplified logic in Thunder#start