Fixed more bugs!! Nearly There!!!