Comment and fix different things