Add some new options and remove debug lightning