Some finishing touches, mostly by Raz