Added more debug options, snapshot #4