Bug fixes in Emulator and added wrappers / dicts for data formats.