add comments
remove custom debugging code