diff --git a/commands/info/userinfo.js b/commands/info/userinfo.js
index d2b4e6d..9984f50 100644
--- a/commands/info/userinfo.js
+++ b/commands/info/userinfo.js
@@ -48,7 +48,9 @@ module.exports = {
 		let discriminator = user.user.discriminator;
 		if(discriminator === "0") 
 			discriminator = "";
-		let username = `**${user.user.username}#${user.user.discriminator}**${nickname}`
+		else
+			discriminator = `#${discriminator}`;
+		let username = `**${user.user.username}${discriminator}**${nickname}`;
 		const embed = new EmbedBuilder()
 			.setThumbnail(user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 }))
 			.setColor(roleColor)
@@ -56,13 +58,15 @@ module.exports = {
 			.setAuthor({name: user.user.username, iconURL: user.user.avatarURL({ format: 'png', dynamic: true, size: 2048 })})
 			.addFields([
 				{ name: "Username", value: username, inline: false },
-				{ name: "Status", value: status, inline: true },
 			]);
 		if (isPresence)
 			embed.addFields([{name: "Presence", value: user.presence.activities[0].name, inline: false}])
-		if (presenceDetails != 0)
+		if (presenceDetails != 0){
 			embed.addFields([{name: "Details", value: presenceDetails.toString(), inline: false}])
-		embed.addFields([{ name: "Details", value: presenceDetails.toString(), inline: false }])
+			embed.addFields([{name: "Status", value: status, inline: true }])
+		}
+		else
+			embed.addFields([{ name: "Status", value: status, inline: false }])
 		embed.addFields([
 			{ name: "Creation date", value: getCreationDate(user), inline: true },
 			{ name: "Join date", value: getJoinDate(user, message.guild), inline: true }
diff --git a/commands/misc/convert.js b/commands/misc/convert.js
index c7ce0dc..49010c9 100644
--- a/commands/misc/convert.js
+++ b/commands/misc/convert.js
@@ -2,7 +2,12 @@ module.exports = {
 	name: 'convert', 
 	description: 'Convert a value to another value',
 	moreHelp: [
-		"To convert celsius to fahrenheit:",
+		"Current units supported:",
+		"F > C > K",
+		"inches > cm",
+		"KG > LB",
+		"Every unit in a line can be converted to any other unit in the same line",
+		"Example:",
 		"<prefix>convert 20 C F"
 	],
 	execute({message, args}) { 
@@ -106,6 +111,35 @@ module.exports = {
 					sendText = "Can only convert to kg from lb.";
 				}
 				break;
+			case "INCHES":
+			case "INCH":
+			case "IN":
+			case "\"":
+				if (args[2].toUpperCase() === "CM") {
+					let CM = (initial_number * 2.54).toFixed(2);
+
+					if(CM[CM.length - 1] === '0' && CM[CM.length - 2] === "0"){
+						CM = CM.replace(".00","")
+					}
+
+					sendText = `${initial_number}" is ${CM} cm`;
+				} else {
+					sendText = "Can only convert to cm from inches.";
+				}
+				break;
+			case "CM":
+				if (args[2].toUpperCase() === "INCH" || args[2].toUpperCase() === "INCHES") {
+					let INCH = (initial_number / 2.54).toFixed(2);
+
+					if(INCH[INCH.length - 1] === '0' && INCH[INCH.length - 2] === "0"){
+						INCH = INCH.replace(".00","")
+					}
+
+					sendText = `${initial_number} cm is ${INCH} inches`;
+				} else {
+					sendText = "Can only convert to inches from cm.";
+				}
+				break;
 			default:
 				sendText = "No conversion method for that yet"
 				break;