minor things throughout