very minor things closes #1 closes #2