comp: Fix output, cosmetical changes