Group things better + improve help