fixup specs, add fabricators, more classes...