fixed some loading problems.