Removes the 'loophole' ion-law

Also adds in some other ion law changes.