#master: documentation more