vvv

more fixes