V 2: various fixes and improvements