Fixed sevearl metrics and improve speed of BDe