Fixed some points raised by Manuel