$Pi -> PI, added PHI, converted references to this in Drawing to T, to fix globals bug