Fixed systemstore constants and got rid of the superfluous zone rep
factor