Fixed bugs - missing ; and == comparisons