more minor improvements + fixes