small fixes/improvements