Add debugging lines
Fix passing of args