fixed (or not, lol) some stuff