small additional improvements