Fixed loader bugs, improved functionality. Should solve most of #3