Updated comments/loader, added tools