adding more info and debug options