RF: removed unneeded warning
Added first part of Ariel's corrections