loader fleshed out. A few minor updates