cleanup based on [XLS]

- added more records as per [XLS]
- reset codepage logic to appease test