updates from @fulv processed with thanks