diff --git a/src/components/AppNavigation/GroupNavigationItem.vue b/src/components/AppNavigation/GroupNavigationItem.vue
index 1e7436e76..ea3dbc64a 100644
--- a/src/components/AppNavigation/GroupNavigationItem.vue
+++ b/src/components/AppNavigation/GroupNavigationItem.vue
@@ -135,10 +135,6 @@ export default {
 	},
 
 	methods: {
-		/**
-		 * @param groups
-		 * @param groupId
-		 */
 		isInGroup(groups, groupId) {
 			return groups.includes(groupId)
 		},
@@ -236,7 +232,7 @@ export default {
 		 * Open mailto: for contacts in a group
 		 *
 		 * @param {object} group of contacts to be emailed
-		 * @param {string} mode
+		 * @param {string} mode 'to', 'cc' or 'bcc' header
 		 */
 		emailGroup(group, mode = 'to') {
 			const emails = []
diff --git a/src/components/CircleDetails.vue b/src/components/CircleDetails.vue
index 8b72a135e..ce3377ecd 100644
--- a/src/components/CircleDetails.vue
+++ b/src/components/CircleDetails.vue
@@ -97,6 +97,7 @@
 			<p>{{ t('contacts', 'Anything shared with this team will show up here') }}</p>
 			<div v-for="provider in resourceProviders" :key="provider.id">
 				<ContentHeading>
+					<!-- eslint-disable-next-line vue/no-v-html -->
 					<span v-show="false" class="provider__icon" v-html="provider.icon" /> {{ provider.name }}
 				</ContentHeading>
 
@@ -110,6 +111,7 @@
 							<span v-if="resource.iconEmoji" class="resource__icon">
 								{{ resource.iconEmoji }}
 							</span>
+							<!-- eslint-disable-next-line vue/no-v-html -->
 							<span v-else-if="resource.iconSvg" class="resource__icon" v-html="resource.iconSvg" />
 							<span v-else-if="resource.iconURL" class="resource__icon">
 								<img :src="resource.iconURL" alt="">
diff --git a/src/components/CircleDetails/CircleConfigs.vue b/src/components/CircleDetails/CircleConfigs.vue
index 557a22f3b..55b00627b 100644
--- a/src/components/CircleDetails/CircleConfigs.vue
+++ b/src/components/CircleDetails/CircleConfigs.vue
@@ -29,7 +29,7 @@
 import { NcCheckboxRadioSwitch as CheckboxRadioSwitch } from '@nextcloud/vue'
 import ContentHeading from './ContentHeading.vue'
 
-import { PUBLIC_CIRCLE_CONFIG } from '../../models/constants.ts'
+import { PUBLIC_CIRCLE_CONFIG, CircleConfig } from '../../models/constants.ts'
 import Circle from '../../models/circle.ts'
 import { CircleEdit, editCircle } from '../../services/circles.ts'
 import { showError } from '@nextcloud/dialogs'
diff --git a/src/components/ContactDetails.vue b/src/components/ContactDetails.vue
index 18f8c7c0b..52eb89535 100644
--- a/src/components/ContactDetails.vue
+++ b/src/components/ContactDetails.vue
@@ -48,6 +48,7 @@
 				<!-- org, title -->
 				<template #subtitle>
 					<template v-if="isReadOnly">
+						<!-- eslint-disable-next-line vue/no-v-html -->
 						<span v-html="formattedSubtitle" />
 					</template>
 					<template v-else>
@@ -88,14 +89,14 @@
 									<IconAccount :size="20" />
 								</template>
 							</ActionButton>
-							<ActionLink v-for="emailAddress in emailAddressList"
-								:key="emailAddress"
+							<ActionLink v-for="address in emailAddressList"
+								:key="address"
 								class="quick-action"
-								:href="'mailto:' + emailAddress">
+								:href="'mailto:' + address">
 								<template #icon>
 									<IconMail :size="20" />
 								</template>
-								{{ emailAddress }}
+								{{ address }}
 							</ActionLink>
 							<ActionLink v-for="phoneNumber in phoneNumberList"
 								:key="phoneNumber"
@@ -402,6 +403,7 @@ import FolderMultipleImage from 'vue-material-design-icons/FolderMultipleImage.v
 import rfcProps from '../models/rfcProps.js'
 import validate from '../services/validate.js'
 
+import Contact from '../models/contact.js'
 import AddNewProp from './ContactDetails/ContactDetailsAddNewProp.vue'
 import ContactAvatar from './ContactDetails/ContactDetailsAvatar.vue'
 import ContactDetailsProperty from './ContactDetails/ContactDetailsProperty.vue'
@@ -1035,7 +1037,7 @@ export default {
 		/**
 		 * Should display the property
 		 *
-		 * @param {Property} property the property to check
+		 * @param {object} property the property to check
 		 * @return {boolean}
 		 */
 		canDisplay(property) {
diff --git a/src/components/ContactsList.vue b/src/components/ContactsList.vue
index ccf0dc4bd..f4fc47878 100644
--- a/src/components/ContactsList.vue
+++ b/src/components/ContactsList.vue
@@ -24,6 +24,7 @@
 import { NcAppContentList as AppContentList } from '@nextcloud/vue'
 import ContactsListItem from './ContactsList/ContactsListItem.vue'
 import VirtualList from 'vue-virtual-scroll-list'
+import Contact from '../models/contact.js'
 
 export default {
 	name: 'ContactsList',
diff --git a/src/components/MemberList/MemberList.vue b/src/components/MemberList/MemberList.vue
index 0fb47e81e..7663851c8 100644
--- a/src/components/MemberList/MemberList.vue
+++ b/src/components/MemberList/MemberList.vue
@@ -81,6 +81,7 @@ import { subscribe } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 import { getRecommendations, getSuggestions } from '../../services/collaborationAutocompletion.js'
 import { SHARES_TYPES_MEMBER_MAP, CIRCLES_MEMBER_GROUPING } from '../../models/constants'
+import Circle from '../../models/circle.js'
 import { defineComponent } from 'vue'
 
 export default defineComponent({
@@ -125,12 +126,8 @@ export default defineComponent({
 	},
 
 	computed: {
-		/**
-		 * Return the current circle
-		 *
-		 * @return {Circle}
-		 */
-		circle() {
+
+		circle(): Circle {
 			return this.$store.getters.getCircle(this.selectedCircle)
 		},
 
diff --git a/src/components/MemberList/MemberListItem.vue b/src/components/MemberList/MemberListItem.vue
index ebe2adab8..81049327d 100644
--- a/src/components/MemberList/MemberListItem.vue
+++ b/src/components/MemberList/MemberListItem.vue
@@ -95,6 +95,7 @@ import IconExitToApp from 'vue-material-design-icons/ExitToApp.vue'
 import IconShieldCheck from 'vue-material-design-icons/ShieldCheck.vue'
 
 import { changeMemberLevel } from '../../services/circles.ts'
+import Circle from '../../models/circle.ts'
 import { showError } from '@nextcloud/dialogs'
 import RouterMixin from '../../mixins/RouterMixin.js'
 
@@ -251,7 +252,7 @@ export default {
 		/**
 		 * Return the promote/demote member action label
 		 *
-		 * @param {MemberLevel} level the member level
+		 * @param {number} level the member level
 		 * @return {string}
 		 */
 		levelChangeLabel(level) {
diff --git a/src/components/Properties/PropertyMultipleText.vue b/src/components/Properties/PropertyMultipleText.vue
index 9dc9db52c..d7d437695 100644
--- a/src/components/Properties/PropertyMultipleText.vue
+++ b/src/components/Properties/PropertyMultipleText.vue
@@ -96,7 +96,7 @@
 
 		<!-- no order enforced: just iterate on all the values -->
 		<template v-else>
-			<div v-for="(value, index) in filteredValue"
+			<div v-for="(valueItem, index) in filteredValue"
 				:key="index"
 				class="property__row">
 				<template v-if="(isReadOnly && filteredValue[index]) || !isReadOnly">
diff --git a/src/components/Properties/PropertyTitle.vue b/src/components/Properties/PropertyTitle.vue
index d30d5c436..bc263d930 100644
--- a/src/components/Properties/PropertyTitle.vue
+++ b/src/components/Properties/PropertyTitle.vue
@@ -68,7 +68,7 @@ export default {
 		},
 		bus: {
 			type: Object,
-			required: false,
+			default: () => ({}),
 		},
 	},
 	computed: {
diff --git a/src/models/circle.ts b/src/models/circle.ts
index 66254039a..d60632993 100644
--- a/src/models/circle.ts
+++ b/src/models/circle.ts
@@ -21,7 +21,7 @@ export default class Circle {
 	/**
 	 * Creates an instance of Circle
 	 *
-	 * @param data
+	 * @param {object} data Circle data object
 	 */
 	constructor(data: object) {
 		this.updateData(data)
@@ -30,7 +30,7 @@ export default class Circle {
 	/**
 	 * Update inner circle data, owner and initiator
 	 *
-	 * @param data
+	 * @param {object} data Updated circle data
 	 */
 	updateData(data: any) {
 		if (typeof data !== 'object') {
@@ -155,7 +155,7 @@ export default class Circle {
 	/**
 	 * Add a member to this circle
 	 *
-	 * @param member
+	 * @param {Member} member The member to add to the circle
 	 */
 	addMember(member: Member) {
 		if (member.constructor.name !== Member.name) {
@@ -172,7 +172,7 @@ export default class Circle {
 	/**
 	 * Remove a member from this circle
 	 *
-	 * @param member
+	 * @param {Member} member The member to remove from the circle
 	 */
 	deleteMember(member: Member) {
 		if (member.constructor.name !== Member.name) {
diff --git a/src/models/contact.js b/src/models/contact.js
index cfb275eff..61a3edb8f 100644
--- a/src/models/contact.js
+++ b/src/models/contact.js
@@ -560,7 +560,7 @@ export default class Contact {
 	 *
 	 * @readonly
 	 * @memberof Contact
-	 * @return {Property[]} http://mozilla-comm.github.io/ical.js/api/ICAL.Property.html
+	 * @return {object[]} http://mozilla-comm.github.io/ical.js/api/ICAL.Property.html
 	 */
 	get properties() {
 		return this.vCard.getAllProperties()
diff --git a/src/models/member.ts b/src/models/member.ts
index 38f5acc97..ec1c90142 100644
--- a/src/models/member.ts
+++ b/src/models/member.ts
@@ -16,8 +16,8 @@ export default class Member {
 	/**
 	 * Creates an instance of Member
 	 *
-	 * @param data
-	 * @param circle
+	 * @param {any} data The member data
+	 * @param {Circle} circle The circle this member belongs to
 	 */
 	constructor(data: any, circle: Circle) {
 		if (typeof data !== 'object') {
diff --git a/src/oca/mountContactDetails.js b/src/oca/mountContactDetails.js
index 36e12ec27..b12b6459e 100644
--- a/src/oca/mountContactDetails.js
+++ b/src/oca/mountContactDetails.js
@@ -15,8 +15,10 @@ import store from '../store/index.js'
 import logger from '../services/logger.js'
 
 /**
- * @param {HTMLElement} el
- * @param {string} contactEmailAddress
+ * Mount the contact details component
+ *
+ * @param {HTMLElement} el The element to mount the component to
+ * @param {string} contactEmailAddress The email address of the contact
  * @return {Promise<object>}
  */
 export function mountContactDetails(el, contactEmailAddress) {
diff --git a/src/services/appendContactToGroup.js b/src/services/appendContactToGroup.js
index 4c752d208..6012afea4 100644
--- a/src/services/appendContactToGroup.js
+++ b/src/services/appendContactToGroup.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import axios from '@nextcloud/axios'
+import Contact from '../models/contact.js'
 
 /**
  * Append a group to a contact
diff --git a/src/services/circles.ts b/src/services/circles.ts
index b4eead97e..75bf6373b 100644
--- a/src/services/circles.ts
+++ b/src/services/circles.ts
@@ -37,7 +37,7 @@ export const getCircles = async function() {
 /**
  * Get a specific circle
  *
- * @param {string} circleId
+ * @param {string} circleId The ID of the circle to fetch
  * @return {object}
  */
 export const getCircle = async function(circleId: string) {
@@ -49,8 +49,8 @@ export const getCircle = async function(circleId: string) {
  * Create a new circle
  *
  * @param {string} name the circle name
- * @param personal
- * @param local
+ * @param {boolean} personal Whether the circle is personal
+ * @param {boolean} local Whether the circle is local
  * @return {object}
  */
 export const createCircle = async function(name: string, personal: boolean, local: boolean) {
diff --git a/src/services/removeContactFromGroup.js b/src/services/removeContactFromGroup.js
index 954e85c71..2946cc0ab 100644
--- a/src/services/removeContactFromGroup.js
+++ b/src/services/removeContactFromGroup.js
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import axios from '@nextcloud/axios'
+import Contact from '../models/contact.js'
 
 /**
- * Append a group to a contact
+ * Remove a group from a contact
  *
  * @param {Contact} contact the contact model
  * @param {string} groupName the group name
diff --git a/src/services/renameContactFromGroup.js b/src/services/renameContactFromGroup.js
index 2f9576110..22547d0ed 100644
--- a/src/services/renameContactFromGroup.js
+++ b/src/services/renameContactFromGroup.js
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import axios from '@nextcloud/axios'
+import Contact from '../models/contact.js'
 
 /**
- * Append a group to a contact
+ * Rename a group for a contact
  *
  * @param {Contact} contact the contact model
  * @param {string} oldGroupName name that gets removed
diff --git a/src/services/validate.js b/src/services/validate.js
index 865807202..d5bb364fc 100644
--- a/src/services/validate.js
+++ b/src/services/validate.js
@@ -7,7 +7,9 @@ import Contact from '../models/contact.js'
 import checks from './checks/index.js'
 
 /**
- * @param contact
+ * Validate a contact by running it through various checks
+ *
+ * @param {Contact} contact The contact to validate
  */
 export default function(contact) {
 	let result = false
diff --git a/src/utils/matchTypes.ts b/src/utils/matchTypes.ts
index 68f8aae7a..71a3a79b5 100644
--- a/src/utils/matchTypes.ts
+++ b/src/utils/matchTypes.ts
@@ -6,8 +6,8 @@
 /**
  * Match a list of types against the available types
  *
- * @param {Array<string>} selectedTypes
- * @param {Array<{id: string, name: string}>} options
+ * @param {Array<string>} selectedTypes Types to match against options
+ * @param {Array<{id: string, name: string}>} options Available type options
  */
 export function matchTypes(selectedTypes: Array<string>, options: Array<{id: string, name: string}>) {
 	const items = options.map(option => {
diff --git a/src/views/ReadOnlyContactDetails.vue b/src/views/ReadOnlyContactDetails.vue
index 4f53ab7bb..d40859179 100644
--- a/src/views/ReadOnlyContactDetails.vue
+++ b/src/views/ReadOnlyContactDetails.vue
@@ -22,7 +22,7 @@
 			<div class="contact-title">
 				<h6>{{ contact.fullName }}</h6>
 				<!-- Subtitle -->
-				<span v-html="formattedSubtitle" />
+				<span>{{ formattedSubtitle }}</span>
 			</div>
 			<div class="contact-details-wrapper">
 				<div v-for="(properties, name) in groupedProperties"