small changes
Merge remote-tracking branch 'origin/tal' into wes
changing process text containers to pixels
Merge remote-tracking branch 'origin/wes' into jeff