small fixes/improvements.