some more minor improvements