more updates/debugging