added Race module capability, fixed some Class issues