consmetic changes and more debug info