Add working_dir option + fixing some stuff