urgent bug-fixes