Fixed Major Bugs.