Adding update delay option, better error handling