Cleaned up, added classes taught.