minor fixes
Merge branch 'master' of github.com:etnbrd/flx-compiler
use of escope