* various improvements