Even more clarifications and fixes