More debugging/updates