more improvements/fixes