Some minor updates / clarifications