APP6 Changes (set 2)

Primarily changes to Python Tools to support 2 standards