some more minor stuff