Re-formatted files to 80 columns. Also added ability to pass some keys as strings.