gen_BO +many small changes.