more clarifications and small changes