merge - and some documentation