tweaking a few minor things