adding remaining profiles, simplified some loading