FIXED (almost) EVERYTHING