Cleanup debuging and add missing details