docs updates

moving f8c48330d3ae78c7cf738d07b656e56098b947a3 and 241c98183bca0ec3e9a74cf1611edeebd54cf98d onto the correct branch