Updating: very minorly tidying-up
Updating: improving support for atspkgreloc