Minor fixing and perfecting