0731 some tweaks