fixes by Francis Van Den Bussche, email 9/5/2014