generalized - small fixes