Fix reloading and add more functionality to the loader
Fixes #10
Fixes #74