More fixes to variables
Added --debuginfo option (disabled by default)