Some changes in format generation and corrections.
More to follow...