moved loading to correct places and improved checks
Fixed doc to use correct interface
Fixed doc to use correct interface