Made adding and displaying variables better
Added tagging variables, plus sanity refactorings