rm overloading, refactor loader, clean up