diff --git a/BRRSuite.csproj b/BRRSuite.csproj
index c91103f..b35d7e4 100644
--- a/BRRSuite.csproj
+++ b/BRRSuite.csproj
@@ -12,8 +12,8 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryType>git</RepositoryType>
     <SignAssembly>False</SignAssembly>
-    <AssemblyVersion>1.0.1</AssemblyVersion>
-    <FileVersion>1.0.1</FileVersion>
+    <AssemblyVersion>1.1.0</AssemblyVersion>
+    <FileVersion>1.1.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <EnableNETAnalyzers>False</EnableNETAnalyzers>
@@ -24,6 +24,7 @@
     <PackageTags>snes;brr;audio;spc700</PackageTags>
     <Product>BRR Suite</Product>
     <Company />
+    <Version>$(AssemblyVersion)</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/Conversion.cs b/Conversion.cs
index 63d8af1..7a77a78 100644
--- a/Conversion.cs
+++ b/Conversion.cs
@@ -79,7 +79,7 @@ public static int Clamp(int v) {
 	/// <param name="v"></param>
 	/// <returns>A new 15-bit value.</returns>
 	public static int Clip(int v) => v switch {
-		>  0x7FFF    => v - 2,      // equivalent to (p + 0x7FFF) & 0x7FFF
+		>  0x7FFF    => (v + 0x7FFF) & 0x7FFF,
 		< -0x8000    => 0,          // clipped to 0
 		>  0x3FFF    => v - 0x8000, // [4000,7FFF] => [-4000,-1]
 		< -0x4000    => v + 0x8000, // [-8000,-4001] => [0,-3FFF]
diff --git a/SampleRate.cs b/SampleRate.cs
index f90a29d..4d4e3cd 100644
--- a/SampleRate.cs
+++ b/SampleRate.cs
@@ -3,11 +3,11 @@
 /// <summary>
 /// Represents an audio sample rate given in hertz.
 /// </summary>
-public sealed class SampleRate : IComparable<SampleRate> {
+public readonly struct SampleRate : IComparable<SampleRate> {
 	/// <summary>
 	/// Gets the number of samples per second expressed by this frequency.
 	/// </summary>
-	public int Frequency { get; }
+	public readonly int Frequency { get; }
 
 	/// <summary>
 	/// Gets the frequency expressed as and rounded to the nearest kilohertz.
@@ -19,11 +19,6 @@ public sealed class SampleRate : IComparable<SampleRate> {
 	/// </summary>
 	public decimal Cram => 32000M / Frequency;
 
-	/// <summary>
-	/// Gets the value of this frequency with units (Hz).
-	/// </summary>
-	public string Name { get; }
-
 	/// <summary>
 	/// Creates a new instance of the <see cref="SampleRate"/> class with the specified frequency.
 	/// </summary>
@@ -34,12 +29,11 @@ public SampleRate(int frequency) {
 			throw new ArgumentException("Frequency should be a positive, non-zero value.");
 		}
 
-		Name = $"{frequency} Hz";
 		Frequency = frequency;
 	}
 
 	/// <inheritdoc cref="object.ToString()"/>
-	public override string ToString() => Name;
+	public override string ToString() => $"{Frequency} Hz";
 
 	/// <summary>
 	/// Calculates the ratio representing this sample rate resampled to the given target frequency.
@@ -57,10 +51,7 @@ public decimal ResampleTo(SampleRate targetFrequency) {
 
 	/// <inheritdoc cref="IComparable.CompareTo(object?)"/>
 	/// <exception cref="ArgumentNullException">If <paramref name="other"/> is <see langword="null"/>.</exception>
-	public int CompareTo(SampleRate? other) {
-		if (other is null) {
-			throw new ArgumentNullException(nameof(other), "Comparator argument was null.");
-		}
+	public int CompareTo(SampleRate other) {
 		return Frequency.CompareTo(other.Frequency);
 	}
 
@@ -88,4 +79,12 @@ public int CompareTo(SampleRate? other) {
 	/// Represents a sample rate of 44100 Hz, the standard for CD-quality audio.
 	/// </summary>
 	public static readonly SampleRate SR44100 = new(44100);
+
+
+
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+	public static explicit operator SampleRate(int sr) => new(sr);
+
+	public static implicit operator int(SampleRate sr) => sr.Frequency;
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }