Various update and clarifications