style improvements + loading improvements