master: some small updates