Cleaned up additions to consolidate into single colophon