small improvements

(with Rasmus & NikosT)