Added temporary debugging options