Various Fixes

Error and Reload Fixes