Aff-Aware VI fixed, affordance classes beefed up