Fixed != not being scanned correctly and remainder not being used