Fixed some Major bugs...