[*] small fixes and improvements