Fixed Various Bugs And Issues