* small improvements -> maybe not