a few more tiny changes