quite a number of things fixed