some urgent fixes