Minor adjustement, documentation for tricky aspects