various micro updates