forgot a file, and did more loader cleanup