Added some classes; some cleanups.