various improvements/fixes