typos in variable names
fix for loadable-macros issue
Merge branch 'development'