fix things and separate upc loading