Minor changes + debug mode