added loading... behavior, plus structure update