Fix Some Major Bugs.