minor improvements + small fix