added some more classes, udpated some others.