more structural changes and debugging features introduced