Finished 10 of the hack fixes; classes modified and/or added.