many fixes, better stability