#68: done
#69: renamed/fixed
#69: fixed Functions super-source variant to be GWT compatible