changes, cleanups, and additions to get to state where seeing data was successfully acquired