Fixing these problems I somehow created in trying to get this whole thing uploaded