Some cover loading enhancements

Plus some ground work for working with covers later