Minor uncomments, routing