Implemented Stéfan's minor comments.