slight changes to the loading system, closes #5 and closes #1