add some more clarifications
add some more missing pieces