Updated with feedback

docx now has tables and images, last part of of feedback was added to
this.