and more fixes

default