Minor modifs; improved documentation