spacing issue and field name issue corrections