Added missing cases to Exp eval and comp methods