more format improvements, using bevry/ambi as the base