actor & small improvements