Also made a litle change to scanner function moveOn(): now it moves on the last char passed and only if there are more than one chars.
