improvements/fixes