more fixes, yeas