cleanuping variable access
Merge branch 'cleanup'
version bump
Merge branch 'forge'
Variable access cleanup
Merge branch 'template_cleanup'