Fix USG problems
Fix merge errors
Fix USG plots
Fix z scaling in USG