Update options

Also, add some `DEBUG` logging
Fixed