some formatting and hacky figure resizing
merging