Merge "Updated and corrected sim documentation"