More options, fix for multithreading bug