Handle an extra column and remove sentence constraint
Minor fixes