few more clarifications, ready to merge