a few tiny improvements