Working on cleaning up some server errors.