more minor stuff