Text fixes
Scanner bug fix