Tables and figures and reformatting
conflicts fixed press on