slight improvements as usual