some loading issues fixed