Add retry count option, clean up error messages, bump version