add safe transfer for bad tokens reorder updateData order refactor tests to be more explicit
start to standardize syntax 4 spaces/tab add implementation reference links improve tests