Add comments and wire up indicators