some slight fixes