Several bug fixes, function calls updated, L2 templates computation in progress