Debug enhancements

Closes #703 #698 #696