Improvements to docs; removed some debugging output