Various changes
Various 2
Work on DEPRECATED statements