Slight changes

Added variables for use within the templates, modified getName to check for alias (using a newer technique in another of your plugins) and corrected some OCD alignment issues...