fixes various and sundry