More updates
Add debug stuff for errors