Added phing and fixed typos

Change-Id: I55c6fe9217b2bf4fe7cfa64acb9e8169c7bf06ad