an improvement here and there... as usual