* More global vars and a fix to Issue #19