Cleanup and better errors