Tweaked saferanges and updated few unitlabels