Minor fixes
Add commented prints for debugging