some fixses