Everything fixed (I believe)