Completed couple things for ods file extraction