made loader, fixed cli