more testing/updates