last changes before renaming to abidos_cpp