XML Error Catchin & various table adjustments