added in-/output-mappings (as far as possible) and added comments