small changes done with Nikos