More quoting of variables
Removed usless debug