First round of changes to tags based on email comments by Paul Norman