Added Errors/debugging