Fixed numerous errors
Ironically DSR errors are still borked