-f and -d options improving, still broken