fixes, new options (still not working)