more fixes/improvements