more fixes, mostly minor