more bug fixes, starting format flexing adjustments.