variaous small fixes