Improve error messages
Comment some printf debugging