jtong - fix a lot of issuet
jtong - fix angular integration issue