-- work in progress --
  * cleaned up debug output