general cleanup, errorHandling() now own method,