fixed some loading issues