changing input imports, finishing input mappings