huge revamp of sets, some proxy fixes