additional improvements for 32f