bug/stability fixes