Fixed Major bugs

continued