More changes / fixes / clarifications