new fixes, new options