Fixed Several Bugs from Expo...