improved formatting and metadata