fixed some problems with load