Fixed a bug and attemted to fix another
New Update