changes to __virtual__, default arguments and comments