Added more debug indicator options

as per request of Anthony