ncm-spma: partial package version resolution + cosmetic changes

Includes reverting #156