fixied minor issues