more fixes, but weirdness not solved yet