Updated some more classes. About 25% done.