Really back to whole output layer correction

Oh, how come that the cocrmain unit escaped the last commit? Strange
things happening here...