PrettyPrint is completed updated and minor updates.

Deleted two useless classes, got rid of most backup references.