last corrections with BIDI. seems like we are ready