added more debug features