remove some todos that have been done already
add rekeying key check (closes #1)