Clean up some stuff and add some logging - the bug still happens :/