Minor improvments acording to CS