More Debugging and Linting