Added new debug tools and requested features
conflict resolution