Clean up existing issues, especially focus on better debugging or errors thanks to @richelbilderbeek's enhancement requests