cleaner debugger code, added more features to core components