some other fixes

exeptions