Add comments
Simplify wire status reporting