Added an auto-update, better error handling.