last few minor things