a few new fixes