misc tiny improvements