bug fixes again in load and drop
3 files changed