Improve arg loader, general changes