Make minor changes. Need to fix the int parsing problem.