Minor tag modification
Started work on better input mapping (premature commit, about to swap computers)