Fixed some stuff Merge branch 'main' of sbox-boomer Fix up