Some new fixes, reworking the 'primary' system