redo logo, minor reorganization