more fixes/improvements here