decoder: add input fields to decoded output; fixes #12