Slight fixes. Moving over to eclipse to delete BNO.