Commented top level classes, cleaned up.